diff options
author | Patrick Burke <patrick.burke@nokia.com> | 2011-07-12 15:27:47 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 07:33:59 +0200 |
commit | 8c64b1cccfb513aaa3560e6eb3ad64e0f30dfd70 (patch) | |
tree | e63a0d1020de54f8fc51ee9ca2f6ae2f950105e6 | |
parent | 4ac960287349de370db4f9224410d2e8bdc9fef9 (diff) |
Updating all qml files to standardize on "import QtQuick 1.0".
Change-Id: If09c645392d34b4174c85462679dbe535fb5b521
Reviewed-on: http://codereview.qt.nokia.com/1476
Reviewed-by: Sarah Jane Smith
49 files changed, 49 insertions, 49 deletions
diff --git a/demos/quick3d/model_viewer/qml/FourButtons.qml b/demos/quick3d/model_viewer/qml/FourButtons.qml index dfc4a840..80d72313 100644 --- a/demos/quick3d/model_viewer/qml/FourButtons.qml +++ b/demos/quick3d/model_viewer/qml/FourButtons.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Item { diff --git a/demos/quick3d/model_viewer/qml/LongButton.qml b/demos/quick3d/model_viewer/qml/LongButton.qml index f06c1bf3..fd7b223c 100644 --- a/demos/quick3d/model_viewer/qml/LongButton.qml +++ b/demos/quick3d/model_viewer/qml/LongButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Rectangle { id: button diff --git a/demos/quick3d/model_viewer/qml/MainButton.qml b/demos/quick3d/model_viewer/qml/MainButton.qml index 6f5cf0d0..0869b570 100644 --- a/demos/quick3d/model_viewer/qml/MainButton.qml +++ b/demos/quick3d/model_viewer/qml/MainButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Image { diff --git a/demos/quick3d/model_viewer/qml/ShortButton.qml b/demos/quick3d/model_viewer/qml/ShortButton.qml index 665840bb..eb8ea4fb 100644 --- a/demos/quick3d/model_viewer/qml/ShortButton.qml +++ b/demos/quick3d/model_viewer/qml/ShortButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Rectangle { id: button diff --git a/demos/quick3d/model_viewer/qml/model_viewer.qml b/demos/quick3d/model_viewer/qml/model_viewer.qml index db599f84..a8b9c0b4 100644 --- a/demos/quick3d/model_viewer/qml/model_viewer.qml +++ b/demos/quick3d/model_viewer/qml/model_viewer.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Rectangle { diff --git a/demos/quick3d/tea_service/qml/Teacup.qml b/demos/quick3d/tea_service/qml/Teacup.qml index f4c86825..9c34b0da 100644 --- a/demos/quick3d/tea_service/qml/Teacup.qml +++ b/demos/quick3d/tea_service/qml/Teacup.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/demos/quick3d/tea_service/qml/Teaspoon.qml b/demos/quick3d/tea_service/qml/Teaspoon.qml index 72125f4b..65712e2e 100644 --- a/demos/quick3d/tea_service/qml/Teaspoon.qml +++ b/demos/quick3d/tea_service/qml/Teaspoon.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/demos/quick3d/tea_service/qml/teaservice.qml b/demos/quick3d/tea_service/qml/teaservice.qml index f549fd50..0812b4ac 100644 --- a/demos/quick3d/tea_service/qml/teaservice.qml +++ b/demos/quick3d/tea_service/qml/teaservice.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/examples/quick3d/basket/qml/basket.qml b/examples/quick3d/basket/qml/basket.qml index 6a15d307..c9a41de7 100644 --- a/examples/quick3d/basket/qml/basket.qml +++ b/examples/quick3d/basket/qml/basket.qml @@ -39,7 +39,7 @@ ****************************************************************************/ //! [1] -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/examples/quick3d/cube/qml/cube.qml b/examples/quick3d/cube/qml/cube.qml index 43ce3dd4..89a7e669 100644 --- a/examples/quick3d/cube/qml/cube.qml +++ b/examples/quick3d/cube/qml/cube.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ //! [1] -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/examples/quick3d/forest/qml/Tree.qml b/examples/quick3d/forest/qml/Tree.qml index 0657d51a..7146f5a7 100644 --- a/examples/quick3d/forest/qml/Tree.qml +++ b/examples/quick3d/forest/qml/Tree.qml @@ -39,7 +39,7 @@ ****************************************************************************/ //![1] -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/examples/quick3d/forest/qml/forest.qml b/examples/quick3d/forest/qml/forest.qml index 8b0fd545..a492ff6a 100644 --- a/examples/quick3d/forest/qml/forest.qml +++ b/examples/quick3d/forest/qml/forest.qml @@ -39,7 +39,7 @@ ****************************************************************************/ //![1] -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/examples/quick3d/lander/qml/lander.qml b/examples/quick3d/lander/qml/lander.qml index ea685658..a1c40286 100644 --- a/examples/quick3d/lander/qml/lander.qml +++ b/examples/quick3d/lander/qml/lander.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/examples/quick3d/matrix_animation/qml/matrix-animation.qml b/examples/quick3d/matrix_animation/qml/matrix-animation.qml index 8834eab4..f5b1f109 100644 --- a/examples/quick3d/matrix_animation/qml/matrix-animation.qml +++ b/examples/quick3d/matrix_animation/qml/matrix-animation.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/examples/quick3d/monkeygod/qml/Penguin.qml b/examples/quick3d/monkeygod/qml/Penguin.qml index 785f89ea..78b6d5d1 100644 --- a/examples/quick3d/monkeygod/qml/Penguin.qml +++ b/examples/quick3d/monkeygod/qml/Penguin.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/examples/quick3d/monkeygod/qml/monkeygod.qml b/examples/quick3d/monkeygod/qml/monkeygod.qml index 48e1aa00..cecdea5e 100644 --- a/examples/quick3d/monkeygod/qml/monkeygod.qml +++ b/examples/quick3d/monkeygod/qml/monkeygod.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/examples/quick3d/moon/qml/moon.qml b/examples/quick3d/moon/qml/moon.qml index e8d265e4..02a70979 100644 --- a/examples/quick3d/moon/qml/moon.qml +++ b/examples/quick3d/moon/qml/moon.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/examples/quick3d/photoroom/qml/PhotoPane.qml b/examples/quick3d/photoroom/qml/PhotoPane.qml index 6120a635..1217727c 100644 --- a/examples/quick3d/photoroom/qml/PhotoPane.qml +++ b/examples/quick3d/photoroom/qml/PhotoPane.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/examples/quick3d/photoroom/qml/photoroom.qml b/examples/quick3d/photoroom/qml/photoroom.qml index 4283535b..2489026c 100644 --- a/examples/quick3d/photoroom/qml/photoroom.qml +++ b/examples/quick3d/photoroom/qml/photoroom.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/examples/quick3d/shaders/qml/Bouncing.qml b/examples/quick3d/shaders/qml/Bouncing.qml index 854ca10d..68c817f8 100644 --- a/examples/quick3d/shaders/qml/Bouncing.qml +++ b/examples/quick3d/shaders/qml/Bouncing.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/examples/quick3d/shaders/qml/Collapsing.qml b/examples/quick3d/shaders/qml/Collapsing.qml index 42cdf41e..63b1e0ef 100644 --- a/examples/quick3d/shaders/qml/Collapsing.qml +++ b/examples/quick3d/shaders/qml/Collapsing.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/examples/quick3d/shaders/qml/Images.qml b/examples/quick3d/shaders/qml/Images.qml index 0ca21e64..0cd157ce 100644 --- a/examples/quick3d/shaders/qml/Images.qml +++ b/examples/quick3d/shaders/qml/Images.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Rectangle { diff --git a/examples/quick3d/shaders/qml/Interpolate.qml b/examples/quick3d/shaders/qml/Interpolate.qml index cb2b7bda..182a3bed 100644 --- a/examples/quick3d/shaders/qml/Interpolate.qml +++ b/examples/quick3d/shaders/qml/Interpolate.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/examples/quick3d/shaders/qml/shaders.qml b/examples/quick3d/shaders/qml/shaders.qml index fc12af90..11bdddc1 100644 --- a/examples/quick3d/shaders/qml/shaders.qml +++ b/examples/quick3d/shaders/qml/shaders.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 Rectangle { property int current : 0 diff --git a/examples/quick3d/sphere/qml/sphere.qml b/examples/quick3d/sphere/qml/sphere.qml index b6adacb3..21056688 100644 --- a/examples/quick3d/sphere/qml/sphere.qml +++ b/examples/quick3d/sphere/qml/sphere.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/src/imports/shapes/Cube.qml b/src/imports/shapes/Cube.qml index 3e116c62..96883399 100644 --- a/src/imports/shapes/Cube.qml +++ b/src/imports/shapes/Cube.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/src/imports/shapes/Quad.qml b/src/imports/shapes/Quad.qml index 0e9877ef..1c2d9845 100644 --- a/src/imports/shapes/Quad.qml +++ b/src/imports/shapes/Quad.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/src/imports/shapes/Teapot.qml b/src/imports/shapes/Teapot.qml index 6cb62b6b..59382ebb 100644 --- a/src/imports/shapes/Teapot.qml +++ b/src/imports/shapes/Teapot.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/src/imports/threed/viewport.cpp b/src/imports/threed/viewport.cpp index d5da789a..f88d19fd 100644 --- a/src/imports/threed/viewport.cpp +++ b/src/imports/threed/viewport.cpp @@ -70,7 +70,7 @@ the size of the view, the camera position, lights, and the main 3D object: \code - import Qt 4.7 + import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/src/threed/viewing/qglcamera.cpp b/src/threed/viewing/qglcamera.cpp index 3cbb43b1..c1242bc4 100644 --- a/src/threed/viewing/qglcamera.cpp +++ b/src/threed/viewing/qglcamera.cpp @@ -305,7 +305,7 @@ QT_BEGIN_NAMESPACE Viewport::camera property: \code - import Qt 4.7 + import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/tests/manual/animations/qml/tst_animations.qml b/tests/manual/animations/qml/tst_animations.qml index a8608624..3eb991ee 100644 --- a/tests/manual/animations/qml/tst_animations.qml +++ b/tests/manual/animations/qml/tst_animations.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tests/manual/displaymodel/qml/tst_displaymodel.qml b/tests/manual/displaymodel/qml/tst_displaymodel.qml index 238bb5d0..ca5cb6f2 100644 --- a/tests/manual/displaymodel/qml/tst_displaymodel.qml +++ b/tests/manual/displaymodel/qml/tst_displaymodel.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tests/manual/model3ds/qml/tst_model3ds.qml b/tests/manual/model3ds/qml/tst_model3ds.qml index 94b916ca..df889fb0 100644 --- a/tests/manual/model3ds/qml/tst_model3ds.qml +++ b/tests/manual/model3ds/qml/tst_model3ds.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tests/manual/navigation1/qml/tst_navigation1.qml b/tests/manual/navigation1/qml/tst_navigation1.qml index 2b339c8b..56b2ac0c 100644 --- a/tests/manual/navigation1/qml/tst_navigation1.qml +++ b/tests/manual/navigation1/qml/tst_navigation1.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tests/manual/qrc/qml/cube.qml b/tests/manual/qrc/qml/cube.qml index 43ce3dd4..89a7e669 100644 --- a/tests/manual/qrc/qml/cube.qml +++ b/tests/manual/qrc/qml/cube.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ //! [1] -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tests/manual/rotation/qml/tst_rotation.qml b/tests/manual/rotation/qml/tst_rotation.qml index 91b360b7..b7f443da 100644 --- a/tests/manual/rotation/qml/tst_rotation.qml +++ b/tests/manual/rotation/qml/tst_rotation.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tests/manual/scaling/qml/tst_scaling.qml b/tests/manual/scaling/qml/tst_scaling.qml index 1dd063b7..ee3a6b86 100644 --- a/tests/manual/scaling/qml/tst_scaling.qml +++ b/tests/manual/scaling/qml/tst_scaling.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tests/manual/submesh/qml/tst_submesh.qml b/tests/manual/submesh/qml/tst_submesh.qml index 0dbbe750..9f63653e 100644 --- a/tests/manual/submesh/qml/tst_submesh.qml +++ b/tests/manual/submesh/qml/tst_submesh.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 // QTBUG-17418 diff --git a/tests/manual/transformations/qml/tst_transformations.qml b/tests/manual/transformations/qml/tst_transformations.qml index 91d51adc..ab4fae51 100644 --- a/tests/manual/transformations/qml/tst_transformations.qml +++ b/tests/manual/transformations/qml/tst_transformations.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 // QTBUG-17408 diff --git a/tests/manual/translation/qml/tst_translation.qml b/tests/manual/translation/qml/tst_translation.qml index be52c5dd..f5a45d19 100644 --- a/tests/manual/translation/qml/tst_translation.qml +++ b/tests/manual/translation/qml/tst_translation.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tutorials/quick3d/shaders/TutorialTeapot.qml b/tutorials/quick3d/shaders/TutorialTeapot.qml index 5f2c29e0..306d25cd 100644 --- a/tutorials/quick3d/shaders/TutorialTeapot.qml +++ b/tutorials/quick3d/shaders/TutorialTeapot.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Item3D { diff --git a/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml b/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml index 081a94c0..134ca362 100644 --- a/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml +++ b/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml b/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml index 37f9ddfd..62018bbc 100644 --- a/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml +++ b/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml b/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml index 6b3595c5..491a9a17 100644 --- a/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml +++ b/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/tutorials/quick3d/shaders/shader-tutorial-lighting.qml b/tutorials/quick3d/shaders/shader-tutorial-lighting.qml index 94bcee74..daaa7b4c 100644 --- a/tutorials/quick3d/shaders/shader-tutorial-lighting.qml +++ b/tutorials/quick3d/shaders/shader-tutorial-lighting.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 import Qt3D.Shapes 1.0 diff --git a/tutorials/quick3d/shaders/shader-tutorial-varying.qml b/tutorials/quick3d/shaders/shader-tutorial-varying.qml index 3341bb7b..26f3ea2d 100644 --- a/tutorials/quick3d/shaders/shader-tutorial-varying.qml +++ b/tutorials/quick3d/shaders/shader-tutorial-varying.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/tutorials/quick3d/shaders/shader-tutorial.qml b/tutorials/quick3d/shaders/shader-tutorial.qml index e76ee58b..57d6083c 100644 --- a/tutorials/quick3d/shaders/shader-tutorial.qml +++ b/tutorials/quick3d/shaders/shader-tutorial.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ //! [1] -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml b/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml index 7a9e61e6..93ba6166 100644 --- a/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml +++ b/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 Viewport { diff --git a/tutorials/quick3d/teapot_qml/qml/teapot.qml b/tutorials/quick3d/teapot_qml/qml/teapot.qml index 97e0bdf5..9baf7d86 100644 --- a/tutorials/quick3d/teapot_qml/qml/teapot.qml +++ b/tutorials/quick3d/teapot_qml/qml/teapot.qml @@ -40,7 +40,7 @@ //![1] //![2] -import Qt 4.7 +import QtQuick 1.0 import Qt3D 1.0 //![2] |